(x_set_name_internal): Set icon to `text', derived from name, when

frame's icon_name isn't a string rather than only when it is nil.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0b352232cb29c44086f21686054418c255cec07c..27040e76822aa44ae21eb1ac79e1473d1c636a3f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-02  John Paul Wallington  <jpw@gnu.org>
+
+       * xfns.c (x_set_name_internal): Set icon to `text', derived from
+       name, when frame's icon_name isn't a string rather than only when
+       it is nil.
+
 2006-06-03  Eli Zaretskii  <eliz@gnu.org>
 
        * w32fns.c (x_set_icon_name): Don't use arg if it's not a string

diff --git a/src/xfns.c b/src/xfns.c
index 9b9ba48ba8287ba6f2b69dc14c5beea38130a741..e6772dc65d9a54179803eaa66097a8d880b3d100 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1626,7 +1626,7 @@ x_set_name_internal (f, name)
        text.format = 8;
        text.nitems = bytes;
 
-       if (NILP (f->icon_name))
+       if (!STRINGP (f->icon_name))
          {
            icon = text;
          }